Code Restructure

The underlying code had a restructure to make it easier to develop and test.

Some features include -C to not clear the console and sorting of test names and suites