Removed uneeded supervisor
Organized files