Restructured code
Uploading version 2