Fixing structure of code to work with make file