WIP
Remove src directory
Add features, servant dirs
Trying to get ecukes to like servant
Use flattened el.mk/