Fixed default settings.
Moved files in a simpler smaller directory structure