move common types to common folder