moving everything into individual packages