Refactor f52* and ec2* modules into proper packages.