Finish splitting the code in different files