WampCRA updates.
Source code refactorings