Fixing model classes to match PSR0 Autoloading Standards