Organized structure via hooks in index, single, page templates
Fixed conflicts after pull from remote repository