Created and rearranged some domain classes