Move more things from src/s to configure