changed the file structure so urls would process correctly
merged from views branch