renamed metafiles and moved stuff around