Moved files around and cleaned them up a bit
Fixed pull conflkicts