Refactoring of imports to work with Rails
Distribution build