Refactoring

Moved classes from temp to an actual package