restructed the folder structure in a oop way