Some refactorings, started new corridor generator