moving files around to package nicely