Renamed main js file
Added order by
Separated concerns in a more angular fashion