Move bundle to Contributions dir and refactor