Revert "Constructor and Methods"

This reverts commit d015b01bfda875f60f145f32e1e4baec34fa88e4.
Re-created the Classes

Re-created the Classes based on the correct v0.3 Class Diagram