Refactoring

Organizing classes in a more logic package structure.