rework include mechanism
add bower support