Updating bulk for new spec. Removing files and refactoring