Moved them out to the right directoryä
Fixed a minor bug