restructure
rename
move includeme
add registration
rename module