WIP - Organizing DE code