Restructure to fit better for requireJS packages