Aligning with poole dir and file structure