Re-organize common crate and add data crate