Major code and artifacts reoganisation