clean pakage structure
start testing refactoring