Improve Makefiles, allow for subdirectories in bins/libs