- Rearranged classes in project.