Separate code in different files
Also build the new files and do not ignore them