Add stubs

wip

re organise
checkstyle fix

Use 2 spaces, not tabs