Dockerization and reorganization