More modular

Made configuring the CTF easier.