Small fixes in directory structure and removing obsolete .gitkeep files