* Refactored javascript files