Removed JSON since it's useless.
Removed Supervisor since it's useless.
Small fixes on structure.