#8 change project's structure;