Renamed a few classes, added clear method to manager