Fix block templates due to renamed context variables
Remove category_tree tag as Oscar specific
Change string formatting to use format
Move 3rd-party libs into separate directory