Move class declarations to common module