Common classes refactored into separate project