Combination of changes to make python code more modular
Re-enable command line building, start of offline building