changed logic of making project, restructurization of makefiles