Refactoring and plans setup

- Refactored into packages
- Fixed imports
- Re-made the plans boilerplate right