Further changes in project directories structure