settings added
Optimalized folder structure