many changes for more structured architecture and simple work