Added the new code, removed the uncessary folders