Restructered code and updated README