Moved some files around, changed some names, added some todo's