minor rearrange of files, shuffling of code in database.Table