Drop ant
Rewrite prefStub
Make amo-validator happy
Flatten structure