Cleaned code using pylint. Renamed some folders. Moved Canonical code to canonical folder