Use absolute paths and change directory structure