Organize js and add angular