Use rails folder structure.  Simplify naming conventions.