Refactoring

Removing the app. names for Classes and giving them their own names.