move everything into pkg subdirectory