Resolved file structure conflict
restructuring file structure