Add en locale for cpm
Reorganize project structure