[Jimmy] Files prepared for angularization.