added swiss round infrastructure
removing unused user directives
more swiss infrastructure
removed unused files