Cleanup

- Folder Change
- Remove SNS icons (Use Font-awsome instead)
- Bug fix