Moving/removing some files. adding some utility libraries