Update Documentation
Fix Structure