Final cleanup and new routed board

Re-routed board based on new placement