add stylus; start refactor module structure