#122 fixed bug in file structure