Renamed files.  In general doing some restructuring to increase clarity

i will also be changing up the database structure soon.