Moved classes to be grouped logically by functionality, not by similarity