Changed directories and files around for organization.