Seperated project into more appropriate files