Reworked the folder structure and changed the names of some namespaces to make theme more logical/less redundant