Elpakit refactoring

This is still a WIP. Have to fiddle with elpakit a little bit more