Refactoring + lost build system