Separated to Common and UI projects