Fixing project's layout