add prebuilt modules and code cleanup