give in and put everything in the main package