REFACTOR Classes to src/main