Moved table to it's own module