Revert "fw/base & Settings now legacy"

This reverts commit 3c2fb011411a1e14d56c08920d9719409cc6befb.