Removed folder-wthin-folder nonsense