Upgrade with pyMarb. Reorganize sources.