Moved all Canonical code to canonical folder