Reorganize isy994i project structure