Fixing project configuration & directory structure