move common classes from solution to core