Seperated code into cohesive files