Changed to add flexibility to dependencies

Also corrected main property to point to the right place