Restructured meta-model and added imports