Fixed a couple of issue in regards to ino files and with import libraries with subfolders.