Directory Structure

Made multiple changes to the directory structure of the project as well
as moved a few files around so that linking is more sensible.