File renames, code cleanup, config vars now stored in array