Changed the organization on javascript files