Fixed Bugs

Changed the structure to the original file