Structure and Makefile

Please see if the changes are allowed.