modified @swapna
merged files in models and controllers into one file