Modulisation. Clean up. Starting to work with orientations for tracing.