added require js to the mix and reorganized