Restructure CDK module for better organisation