Separate controls into logical groups
Fix issues with lost VS2010 files