Rechanged project structure
Fixed edited file