Moving into folders
Fix foldername typo
More folder reorg