Added new directories
Fixed routing