classes moved to separate directory