Turn into proper package