Moved Dependencies
Deprecated several classes
Whitespace
Removed static instance on abstract class