Move to a src / dist build