Better directory structure
Fixes for new directory structure