Re-organizing some classes/files to better reflect their purpose