changed some directories aroud and added to .gitignore