Changed project structure and optmized synchronization