Clean up
Change package
Refactoring