Edited URI class
home controller edited
Database class edited