Added more modules, integrated static/cachedirs