Adding back files that were removed in clean-up

Files/folders that were temporary removed in the clean-up are added back