Changed Names and moved packages around
added extra controls and js refactoring