moved a few files around to their proper directories and modified a few of them