renamed files #19

TIdied up database and renamed files