Moved around files to appropriate locations within related composer deps