Massive Extensions

Created Collections class and subclasses and decoupled a few more
elements.