Fix issues on directory structure