Added support for library files and rearranged make accordingly