Bit better

Splits out into different files based on code