First round of porting olf files in more modular structure