FIX: Use nested, relative imports

Ready for review.