Seperated functions into different files