refactoring
added old stuff
added site in a sep. dir
refactoring 2