fixes for travis build / changed directory structure