Refactored name of all js files | refactored marker popup template