Updated readme and organized imports