Fixed some things regarding removal of Bastion Blocks and the new
search/storage method
Changed package name to be more standard