Changed folder structure

- Changed folder structure
- Removed apple touch icon
Fixed some conflicts