Acceptance testing finished
Packages refactored