Cleaned up structure to match more closly to a rails application