Moved to single folder, need to merge Dockerfiles