Brett - File restructure and recompile.