Separated most classes in different files