Refactor file organization

Making huge files initially creates more work later,