Structure and code cleanup
Big Up(date)