Changed directory structure, started runtime selection on compile time