Feature/bundles

Initial bundle setup implemented