add battery model; update fixture posts
directory reorg