Rearranged file structure and updated README