Refactoring to proper file layout
Fixed typeo in addPOs line 1