Working on properly organizing functions into different files