Starting Angular overhaul

Changed file names and to reflect the proper name of the form.