Moved all basic blocks into one constructor class