Moved files to /dev. Other small improvements