Added support for keeping file structure

fixes #21