Code tweaks
Code consolidation
Fixed wrong path
Better config (hopefully)
More modular organization