Refactor into the usual filesystem structure
Integrated works