Reshuffling javascript files. Addresses issue #2.