WIP to werk
WIP
huge refactor
fix path conventions
fix some source logic