wording
moved some classes to new files