Updated initial structure
initial delete data with some refactoring working