Introduce includes/utils directory