Beginning to refactor to sensible project layout