Moved stuff around, major work complete.

Reason for commit: Moving project onto Jura