Add: icon, restructure, major fix from lint.