Updated the entire project structure to a more logical model.