Moved the Table stuff into its own Package