Modified dir structure to make more sense. Updated neccessary files with new paths. Close #77