Renamed func names
Added package basic handlers