Additional refactoring to comply with distutil pseudo-standards.
Adds wp directory for hierarchical lib organization