Moving ospf file back to include folder, other minor changes