#master - moved classes to their respective places