Rearranged javascript files