Some changes in file structure
Some changes in structure