Fixed package issues, trimmed old files and updated README