What happens if you create a 'lib/' directory and move both modules under there as appropriate?