Added gitignore
Moved several files
Cleaned code