adjusted directory structure, added url pattern matching