moved some files, updated protocols
refactorization