more acid state, renamed modules to be more readable