Conform to rails 4 dir structure