Refactored all files
Bundle updated