Spring cleaning

Moving files around and cleaning out the excess.