Moved embedded files into separate file - added library support