Removed modernizr libraries; reorganized libs; fixed test