Re-upping everything with better organization