Start separating code into different files