[master] WIP refactor class and package