cleaned up directory a lot; made more usable; removed hard-paths