Version 0.6 Simplify doc structure