Folder Changes + fixing namespaces and bugs

Fixed 2 bugs with exit and number of moves.
Changed folders