Restructure internals: Introduce fixed structure commands and tasks