gitignore
organized and fixed

Moved into packages and removed some pesky @Overrides that break everything.