Remove trait-aware prepares (Issue #51)
Fix composer.json for new dir structure