separated classes

order and separated classes