Fixed #9 and renamed some folders
added more sensible watch