Restructuring project
Restructuring project - moving files to new structure
Fixing project setup for IntelliJ