Changed project structure. Removed common. Maven structure upgrade