Added registration & login, controller restructure