Refactoring for IDEA Project structure
Reorganized code for future additions