moved stm and polished makefile
fixes