Initial work on refactoring the whole mess of this site - personal one