Moved back into its own project