change classloading to modules