wip
Cleaned up the root directory and ensured future imports were in correct places