Update packages, tidying
Work in progress, adding static data class