less intrusive structure ;)
updated Slakefile to new structure :)