Fixed classpath
Changed some things to make it more modular/cleaner
Removed .settings
Merged 'Tabish' with master