Fixed upload responses
Added more modularity, woo...