Moved common chapter, started adding structure