got bundled version working and simplified directory structure