Restructured code, and modified README