Organise packages
Improve grammar
Implement basic refactoring