Small chages in coding guidelines, restructured filesystem hierachy again