Hack to work with mock providers
Reorganized folder structure and settings
Removed unused resource