Refactoring

Changed packaging structure