Restructure and updated readme