Some major restructuring of the project. Brace yourself!