Fix package paths, and allow batch command line processing