More cleanup to make the project easier to navigate as more files continue to be added