Move some files around

Move some files around
and add a missing part of design notes