Updated config.rb and rearranged directories accordingly