Minor refactoring; Moved classes around to accomodate in suitable package