Re-organized javascript files