Fix icon size
Organize modules