Refactored the front end code in terms of naming scheme and location.
Much cleaner now.