re-org source directories to be flatter and follow the book structure