moved to more sensible dirs
lots of work