Issue #12 Fixed path after reorganization