Fixed documentation generation problem caused by moving source files into subdirectories
Increased framework flexibility for future expansion