Move folder into correct structure