[arch-dev-public] moving stuff into extra