Merge pull request #836 from leider/master

restructured the repository for integration of socrates website