Fixing project layout