minor changes + added basics for groovy module system