Remove additional jquery and refactor folder structure