changed the file structures to something a bit more human