Deleted infrasctrure project and added some refactor