Some refactoring + importing more content structure