Some changes done for production deployment
Moved some files