moving classes to common repos