Moved files based around static data into a separate package