Major refactoring to clean up Bio package