refactor skeleton dir layout and loading slightly
check bundle interface before using
refactor attribute adding code