refining directory structure and playing around
with makefiles