Restructure for Requirejs