Split the simple version to its own file