move folder creation into proper areas