Change some file names and move some code to match jekyll organisation
Remove space