Reorganizing

Just changing up the folder structure to be a bit nicer.  That way it's
easier to recognize what is where.