Change directory structure to be more like ActiveSupport