Got rid of all current warnings and moved some files around.