Rearranged some models, DB tables