move shape definitions to seperate file