Reorganizing

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