move files into proper package