Removed deprecated file
Fixed object naming and added __construct methods
Fixed object naming
Fixed class references and PSR-2 errors