Fixed folder structure

also removed files that .gitignore ignores (they are removed
automatically)