moved stuff into correct project