Minor fixes, changes in dir structure