Added grunt, re-arranged folders and began server upgrade!