renamed files and dirs to follow rails conventions