CPK Refactoring - deleted some duplicated classes