Moved common classes to a common location