Created 'common' package, moved common classes