Renamed files
Implement nested handling. Fixes #2