Re-organizing a few things