folder/file structure improvement.