organize classes

organization!!!