Added proper folder structure to project, removing previous structure that relied on file references.