Fix project settings and directory structure