Made the directory layout more 'ruby-like'