Fine-tuning build: F2 version # in src, new basic packages