consolidate/rename directory structure
consolidate/rename directory structure