Moved files into package directory