Re-Arrange folder structure and clean up jshint errors.