IDE Change-up

Switched project files from Eclipse to IntelliJ
Started code clean-up