Merge pull request #21 from ungureanuvladvictor/generic_folder_structure