Move stuff around a bit
remove unused .gitignore files
Move stuff around
bug fixes