Restructured code
Fixed build
Updated icon