front refactoring rb files almost complete