Prepare new architecture

Delete old code