Moving classes to proper module