new directories (architecture, files), updated makefile + main