merged tabbed files, clean hardcoded options
merged tabbed files, clean hardcoded options
changed tabs to spaces
removed external lib