moving stuff around
removing uploaded photos again
added some tests