Added basic teir level 1 classes | Refactored packages