removed trash (parser is on branch "with parser")
modules in one place