Add mock Icons and Move files into folders
Merge branch 'addicon' into develop