Renamed users files
Added comapnies to resources
Added some tests for companies