Bower directory support and better cleanup