changed directory structure

Moved classes into packages for archiving