wok package moved outside src
Bug fixes and small changes