set up modules, reorganized libs & styles

timeout is temp