Moved Category into its own file