security and controllers package created.
Classes renamed and some clean up