Changed directory structure to make it easier to organize classes by their function