Some fixes on cleanup
Load users class in each required files