Renamed and restructured the core as well as the test suite