Improved structure, configurability and documentation