Changed structure of manifest to separate platform from language