Borke down the two main classes into smaller classes and renamed them accordingly
Modified the main plugin file to require all the new classes and instantiate them at launch