Issue 1 solved. Changing to new files.

Deleted all old files from my fork and added new files.