Folder Refactoring
Demo Removed