Cleaner directory structure, fix for Segmentation Fault
Fixes for bugs, clean up repo.