* Improvements in directory/files layout